bitkeeper revision 1.1159.170.50 (419cc892pqywup6fAiGc7HTzkaGmWQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 18 Nov 2004 16:06:42 +0000 (16:06 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 18 Nov 2004 16:06:42 +0000 (16:06 +0000)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-unstable.bk


Trivial merge